Since babl_foo_from_id() will not be part of the public API we can

revert to having the short variant babl_foo() instead of
babl_foo_from_name().

* babl/babl-class.h
* babl/babl-component.h
* babl/babl-conversion.c
* babl/babl-conversion.h
* babl/babl-extension.h
* babl/babl-fish-path.c
* babl/babl-fish.c
* babl/babl-format.c
* babl/babl-format.h
* babl/babl-image.c
* babl/babl-internal.h
* babl/babl-model.c
* babl/babl-model.h
* babl/babl-type.c
* babl/babl-type.h
* extensions/CIE-Lab.c
* extensions/frequency.c
* extensions/gegl-fixups.c
* extensions/gggl-lies.c
* extensions/gggl.c
* extensions/gimp-8bit.c
* extensions/naive-CMYK.c
* extensions/sse-fixups.c
* tests/grayscale_to_rgb.c
* tests/rgb_to_bgr.c
* tests/rgb_to_ycbcr.c

svn path=/trunk/; revision=389

diff --git a/ChangeLog b/ChangeLog
index 5dd3c2cf3f26ed3303ffcf7dfee3a13f328790ca..ac3293bfb8a5d02b8043adc60713d3abd66fe603 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,36 @@
+2009-01-18  Martin Nordholts  <martinn@svn.gnome.org>
+
+       Since babl_foo_from_id() will not be part of the public API we can
+       revert to having the short variant babl_foo() instead of
+       babl_foo_from_name().
+
+       * babl/babl-class.h
+       * babl/babl-component.h
+       * babl/babl-conversion.c
+       * babl/babl-conversion.h
+       * babl/babl-extension.h
+       * babl/babl-fish-path.c
+       * babl/babl-fish.c
+       * babl/babl-format.c
+       * babl/babl-format.h
+       * babl/babl-image.c
+       * babl/babl-internal.h
+       * babl/babl-model.c
+       * babl/babl-model.h
+       * babl/babl-type.c
+       * babl/babl-type.h
+       * extensions/CIE-Lab.c
+       * extensions/frequency.c
+       * extensions/gegl-fixups.c
+       * extensions/gggl-lies.c
+       * extensions/gggl.c
+       * extensions/gimp-8bit.c
+       * extensions/naive-CMYK.c
+       * extensions/sse-fixups.c
+       * tests/grayscale_to_rgb.c
+       * tests/rgb_to_bgr.c
+       * tests/rgb_to_ycbcr.c
+
 2009-01-18  Martin Nordholts  <martinn@svn.gnome.org>
 
        Add include guards.

diff --git a/babl/babl-class.h b/babl/babl-class.h
index 811dff7eae30f9642f86c10939606c12dbc7f065..4b995ad562002d925705c4fa75d1bc719b5df7c0 100644 (file)
--- a/babl/babl-class.h
+++ b/babl/babl-class.h
@@ -51,7 +51,7 @@ void   babl_##klass##_class_for_each (BablEachFunction  each_fun,  \
 #define BABL_NAMED_CLASS_DECLARE(klass)                        \
                                                                \
 BABL_CLASS_DECLARE (klass);                                    \
-Babl * babl_##klass##_from_name (const char       *name);      \
+Babl * babl_##klass             (const char       *name);      \
 Babl * babl_##klass##_new       (void             *first_arg,  \
                                   ...) BABL_ARG_NULL_TERMINATED
 

diff --git a/babl/babl-component.h b/babl/babl-component.h
index 67e7c0535d37508bf808e4882c2032a5739467fd..e7f7852f84960c3c3a8a09ad0987e85e35c98852 100644 (file)
--- a/babl/babl-component.h
+++ b/babl/babl-component.h
@@ -32,12 +32,6 @@ BABL_NAMED_CLASS_DECLARE (component);
  *                            NULL);
  */
 
-#ifndef BABL_DISABLE_DEPRECATED
-
-#define babl_component babl_component_from_name
-
-#endif /* BABL_DISABLE_DEPRECATED */
-
 
 typedef struct
 {

diff --git a/babl/babl-conversion.c b/babl/babl-conversion.c
index c633353db6fc66a419244f181276722d79a4b7ba..bcb80cb1cc339a6a32f42bef12867359b59ab890 100644 (file)
--- a/babl/babl-conversion.c
+++ b/babl/babl-conversion.c
@@ -450,12 +450,12 @@ babl_conversion_error (BablConversion *conversion)
   Babl *fmt_source;
   Babl *fmt_destination;
 
-  Babl *fmt_rgba_double = babl_format_new (babl_model_from_name ("RGBA"),
-                                           babl_type_from_name ("double"),
-                                           babl_component_from_name ("R"),
-                                           babl_component_from_name ("G"),
-                                           babl_component_from_name ("B"),
-                                           babl_component_from_name ("A"),
+  Babl *fmt_rgba_double = babl_format_new (babl_model ("RGBA"),
+                                           babl_type ("double"),
+                                           babl_component ("R"),
+                                           babl_component ("G"),
+                                           babl_component ("B"),
+                                           babl_component ("A"),
                                            NULL);
 
   double  error       = 0.0;

diff --git a/babl/babl-conversion.h b/babl/babl-conversion.h
index ce8507479785f8a1a6e55a0c513b7e30e05caa38..edfc8d2e30dbf9afb8cd8b6d762e29215ef1b55d 100644 (file)
--- a/babl/babl-conversion.h
+++ b/babl/babl-conversion.h
@@ -34,12 +34,6 @@ BABL_NAMED_CLASS_DECLARE (conversion);
  *                              NULL);
  */
 
-#ifndef BABL_DISABLE_DEPRECATED
-
-#define babl_conversion babl_conversion_from_name
-
-#endif /* BABL_DISABLE_DEPRECATED */
-
 
 /* Type and Format */
 typedef long (*BablFuncLinear)    (char  *src,

diff --git a/babl/babl-extension.h b/babl/babl-extension.h
index ec9fed1157abd09eb33a26712541bb5c76dbd311..9652e245d1d685d7dca58ce5ec2ec53994436d39 100644 (file)
--- a/babl/babl-extension.h
+++ b/babl/babl-extension.h
@@ -30,12 +30,6 @@ BABL_NAMED_CLASS_DECLARE (extension);
  * BablExtension objects are only used internally in babl.
  */
 
-#ifndef BABL_DISABLE_DEPRECATED
-
-#define babl_extension babl_extension_from_name
-
-#endif /* BABL_DISABLE_DEPRECATED */
-
 
 typedef struct
 {

diff --git a/babl/babl-fish-path.c b/babl/babl-fish-path.c
index 29c7bd597a6e0ec71a051d11efa44aaa6ba3236a..038aaaa7e29f724fbf43db40c6adeef455d8892a 100644 (file)
--- a/babl/babl-fish-path.c
+++ b/babl/babl-fish-path.c
@@ -397,12 +397,12 @@ init_path_instrumentation (Babl *fmt_source,
   if (!fmt_rgba_double)
     {
       fmt_rgba_double = babl_format_new (
-        babl_model_from_name ("RGBA"),
-        babl_type_from_name ("double"),
-        babl_component_from_name ("R"),
-        babl_component_from_name ("G"),
-        babl_component_from_name ("B"),
-        babl_component_from_name ("A"),
+        babl_model ("RGBA"),
+        babl_type ("double"),
+        babl_component ("R"),
+        babl_component ("G"),
+        babl_component ("B"),
+        babl_component ("A"),
         NULL);
     }
 

diff --git a/babl/babl-fish.c b/babl/babl-fish.c
index 3052377a5008d935f7386a3f8f0be556839c5e31..a7b5cf7fd2a61d39355dad100906f5d36d9444f8 100644 (file)
--- a/babl/babl-fish.c
+++ b/babl/babl-fish.c
@@ -165,7 +165,7 @@ babl_fish (const void *source,
     source_format = source;
 
   if (!source_format)
-    source_format = babl_format_from_name ((char *) source);
+    source_format = babl_format ((char *) source);
 
   if (!source_format)
     {
@@ -177,7 +177,7 @@ babl_fish (const void *source,
     destination_format = destination;
 
   if (!destination_format)
-    destination_format = babl_format_from_name ((char *) destination);
+    destination_format = babl_format ((char *) destination);
 
   if (!destination_format)
     {

diff --git a/babl/babl-format.c b/babl/babl-format.c
index 24af1fadf8ac5ccb5b853df14cb611bb22a96a31..f72143aaa4b5dd6784a1d5106dab4fe15e947a4b 100644 (file)
--- a/babl/babl-format.c
+++ b/babl/babl-format.c
@@ -393,12 +393,12 @@ babl_format_loss (Babl *babl)
   Babl   *fish_from;
 
   ref_fmt = babl_format_new (
-    babl_model_from_name ("RGBA"),
-    babl_type_from_name ("double"),
-    babl_component_from_name ("R"),
-    babl_component_from_name ("G"),
-    babl_component_from_name ("B"),
-    babl_component_from_name ("A"),
+    babl_model ("RGBA"),
+    babl_type ("double"),
+    babl_component ("R"),
+    babl_component ("G"),
+    babl_component ("B"),
+    babl_component ("A"),
     NULL);
 
   if (babl->format.loss != -1.0)

diff --git a/babl/babl-format.h b/babl/babl-format.h
index 7a049d15ceedf448a1759863ac9783c4d0edeaa8..1e1de1f4aebb3e4c5d8e58402090c1e9cc3be79a 100644 (file)
--- a/babl/babl-format.h
+++ b/babl/babl-format.h
@@ -44,12 +44,6 @@ BABL_NAMED_CLASS_DECLARE (format);
  * name is used.
  */
 
-#ifndef BABL_DISABLE_DEPRECATED
-
-#define babl_format babl_format_from_name
-
-#endif /* BABL_DISABLE_DEPRECATED */
-
 
 typedef struct
 {

diff --git a/babl/babl-image.c b/babl/babl-image.c
index ea6b39cac23cd7d8e75f654d912e70317b3d200e..eb1f6ff5e7e3d20fda92f330716f1458091dbd38 100644 (file)
--- a/babl/babl-image.c
+++ b/babl/babl-image.c
@@ -198,7 +198,7 @@ babl_image_new (void *first,
         }
       else
         {
-          new_component = (BablComponent *) babl_component_from_name (arg);
+          new_component = (BablComponent *) babl_component (arg);
         }
 
       /* FIXME: add error checking */

diff --git a/babl/babl-internal.h b/babl/babl-internal.h
index 17cb8cf18601274adf5796c0a9ffa2d3e4c6f5a0..6024d87663ad46819a6b6b626a9081772463df49 100644 (file)
--- a/babl/babl-internal.h
+++ b/babl/babl-internal.h
@@ -239,7 +239,7 @@ babl_##klass##_class_for_each (BablEachFunction  each_fun,    \
 BABL_CLASS_MINIMAL_IMPLEMENT(klass)                           \
                                                               \
 Babl *                                                        \
-babl_##klass##_from_name (const char *name)                   \
+babl_##klass (const char *name)                               \
 {                                                             \
   Babl *babl;                                                 \
                                                               \

diff --git a/babl/babl-model.c b/babl/babl-model.c
index 7b61229773d1964d9ae023b8f7f716e231b7444f..e7e59ca317a6a9629636554c72b25884aa236d29 100644 (file)
--- a/babl/babl-model.c
+++ b/babl/babl-model.c
@@ -209,12 +209,12 @@ static Babl *reference_format (void)
 
   if (!self)
     self = babl_format_new (
-      babl_model_from_name ("RGBA"),
-      babl_type_from_name ("double"),
-      babl_component_from_name ("R"),
-      babl_component_from_name ("G"),
-      babl_component_from_name ("B"),
-      babl_component_from_name ("A"),
+      babl_model ("RGBA"),
+      babl_type ("double"),
+      babl_component ("R"),
+      babl_component ("G"),
+      babl_component ("B"),
+      babl_component ("A"),
       NULL);
   return self;
 }
@@ -226,7 +226,7 @@ static Babl *construct_double_format (Babl *model)
   int   i;
 
   argument[args++] = model;
-  argument[args++] = babl_type_from_name ("double");
+  argument[args++] = babl_type ("double");
 
   for (i = 0; i < model->model.components; i++)
     {

diff --git a/babl/babl-model.h b/babl/babl-model.h
index 41ccf5eba5c52ac5e68a63a05a4ca8ee76250099..7b8a54c36df8832ade423f74c083d9f957140356 100644 (file)
--- a/babl/babl-model.h
+++ b/babl/babl-model.h
@@ -37,12 +37,6 @@ BABL_NAMED_CLASS_DECLARE (model);
  *
  */
 
-#ifndef BABL_DISABLE_DEPRECATED
-
-#define babl_model babl_model_from_name
-
-#endif /* BABL_DISABLE_DEPRECATED */
-
 
 typedef struct
 {

diff --git a/babl/babl-type.c b/babl/babl-type.c
index fdad51f32369150cb54abaf8f4f9798ed0601782..a1537acf6c729ba8b859367d2bd773dae701136b 100644 (file)
--- a/babl/babl-type.c
+++ b/babl/babl-type.c
@@ -182,9 +182,9 @@ static Babl *double_vector_format (void)
 
   if (!self)
     self = babl_format_new (
-      babl_model_from_name ("Y"),
-      babl_type_from_name ("double"),
-      babl_component_from_name ("Y"),
+      babl_model ("Y"),
+      babl_type ("double"),
+      babl_component ("Y"),
       NULL);
   return self;
 }
@@ -206,9 +206,9 @@ babl_type_is_symmetric (Babl *babl)
   test_init (0.0, 182.0);
 
   ref_fmt = double_vector_format ();
-  fmt     = babl_format_new (babl_model_from_name ("Y"),
+  fmt     = babl_format_new (babl_model ("Y"),
                              babl,
-                             babl_component_from_name ("Y"),
+                             babl_component ("Y"),
                              NULL);
   fish_to   = babl_fish_reference (ref_fmt, fmt);
   fish_from = babl_fish_reference (fmt, ref_fmt);

diff --git a/babl/babl-type.h b/babl/babl-type.h
index e14c109609fa90275f1ec8fc913d8b6db3da53e6..581317c989c9f6ebef03c86a8117b950edbee31b 100644 (file)
--- a/babl/babl-type.h
+++ b/babl/babl-type.h
@@ -38,12 +38,6 @@ BABL_NAMED_CLASS_DECLARE (type);
  *                         NULL);
  */
 
-#ifndef BABL_DISABLE_DEPRECATED
-
-#define babl_type babl_type_from_name
-
-#endif /* BABL_DISABLE_DEPRECATED */
-
 
 typedef struct
 {

diff --git a/extensions/CIE-Lab.c b/extensions/CIE-Lab.c
index 2865a4bd83eee37308c5f2f8b7f0c721c9dba1f0..47cbbd5d35e575a56504f1e0bc5a6db55de19f16 100644 (file)
--- a/extensions/CIE-Lab.c
+++ b/extensions/CIE-Lab.c
@@ -55,17 +55,17 @@ models (void)
 {
   babl_model_new (
     "name", "CIE Lab",
-    babl_component_from_name ("CIE L"),
-    babl_component_from_name ("CIE a"),
-    babl_component_from_name ("CIE b"),
+    babl_component ("CIE L"),
+    babl_component ("CIE a"),
+    babl_component ("CIE b"),
     NULL);
 
   babl_model_new (
     "name", "CIE Lab alpha",
-    babl_component_from_name ("CIE L"),
-    babl_component_from_name ("CIE a"),
-    babl_component_from_name ("CIE b"),
-    babl_component_from_name ("A"),
+    babl_component ("CIE L"),
+    babl_component ("CIE a"),
+    babl_component ("CIE b"),
+    babl_component ("A"),
     NULL);
 }
 
@@ -232,26 +232,26 @@ static void
 conversions (void)
 {
   babl_conversion_new (
-    babl_model_from_name ("RGBA"),
-    babl_model_from_name ("CIE Lab"),
+    babl_model ("RGBA"),
+    babl_model ("CIE Lab"),
     "linear", rgba_to_lab,
     NULL
   );
   babl_conversion_new (
-    babl_model_from_name ("CIE Lab"),
-    babl_model_from_name ("RGBA"),
+    babl_model ("CIE Lab"),
+    babl_model ("RGBA"),
     "linear", lab_to_rgba,
     NULL
   );
   babl_conversion_new (
-    babl_model_from_name ("RGBA"),
-    babl_model_from_name ("CIE Lab alpha"),
+    babl_model ("RGBA"),
+    babl_model ("CIE Lab alpha"),
     "linear", rgba_to_laba,
     NULL
   );
   babl_conversion_new (
-    babl_model_from_name ("CIE Lab alpha"),
-    babl_model_from_name ("RGBA"),
+    babl_model ("CIE Lab alpha"),
+    babl_model ("RGBA"),
     "linear", laba_to_rgba,
     NULL
   );
@@ -264,47 +264,47 @@ formats (void)
 {
   babl_format_new (
     "name", "CIE Lab float",
-    babl_model_from_name ("CIE Lab"),
+    babl_model ("CIE Lab"),
 
-    babl_type_from_name ("float"),
-    babl_component_from_name ("CIE L"),
-    babl_component_from_name ("CIE a"),
-    babl_component_from_name ("CIE b"),
+    babl_type ("float"),
+    babl_component ("CIE L"),
+    babl_component ("CIE a"),
+    babl_component ("CIE b"),
     NULL);
 
   babl_format_new (
     "name", "CIE Lab alpha float",
-    babl_model_from_name ("CIE Lab alpha"),
+    babl_model ("CIE Lab alpha"),
 
-    babl_type_from_name ("double"),
-    babl_component_from_name ("CIE L"),
-    babl_component_from_name ("CIE a"),
-    babl_component_from_name ("CIE b"),
-    babl_component_from_name ("A"),
+    babl_type ("double"),
+    babl_component ("CIE L"),
+    babl_component ("CIE a"),
+    babl_component ("CIE b"),
+    babl_component ("A"),
     NULL);
 
   babl_format_new (
     "name", "CIE Lab u8",
-    babl_model_from_name ("CIE Lab"),
-
-    babl_type_from_name ("CIE u8 L"),
-    babl_component_from_name ("CIE L"),
-    babl_type_from_name ("CIE u8 ab"),
-    babl_component_from_name ("CIE a"),
-    babl_type_from_name ("CIE u8 ab"),
-    babl_component_from_name ("CIE b"),
+    babl_model ("CIE Lab"),
+
+    babl_type ("CIE u8 L"),
+    babl_component ("CIE L"),
+    babl_type ("CIE u8 ab"),
+    babl_component ("CIE a"),
+    babl_type ("CIE u8 ab"),
+    babl_component ("CIE b"),
     NULL);
 
   babl_format_new (
     "name", "CIE Lab u16",
-    babl_model_from_name ("CIE Lab"),
-
-    babl_type_from_name ("CIE u16 L"),
-    babl_component_from_name ("CIE L"),
-    babl_type_from_name ("CIE u16 ab"),
-    babl_component_from_name ("CIE a"),
-    babl_type_from_name ("CIE u16 ab"),
-    babl_component_from_name ("CIE b"),
+    babl_model ("CIE Lab"),
+
+    babl_type ("CIE u16 L"),
+    babl_component ("CIE L"),
+    babl_type ("CIE u16 ab"),
+    babl_component ("CIE a"),
+    babl_type ("CIE u16 ab"),
+    babl_component ("CIE b"),
     NULL);
 }
 
@@ -423,27 +423,27 @@ types_u8 (void)
   );
 
   babl_conversion_new (
-    babl_type_from_name ("CIE u8 L"),
-    babl_type_from_name ("double"),
+    babl_type ("CIE u8 L"),
+    babl_type ("double"),
     "plane", convert_u8_l_double,
     NULL
   );
   babl_conversion_new (
-    babl_type_from_name ("double"),
-    babl_type_from_name ("CIE u8 L"),
+    babl_type ("double"),
+    babl_type ("CIE u8 L"),
     "plane", convert_double_u8_l,
     NULL
   );
 
   babl_conversion_new (
-    babl_type_from_name ("CIE u8 ab"),
-    babl_type_from_name ("double"),
+    babl_type ("CIE u8 ab"),
+    babl_type ("double"),
     "plane", convert_u8_ab_double,
     NULL
   );
   babl_conversion_new (
-    babl_type_from_name ("double"),
-    babl_type_from_name ("CIE u8 ab"),
+    babl_type ("double"),
+    babl_type ("CIE u8 ab"),
     "plane", convert_double_u8_ab,
     NULL
   );
@@ -562,27 +562,27 @@ types_u16 (void)
 
 
   babl_conversion_new (
-    babl_type_from_name ("CIE u16 L"),
-    babl_type_from_name ("double"),
+    babl_type ("CIE u16 L"),
+    babl_type ("double"),
     "plane", convert_u16_l_double,
     NULL
   );
   babl_conversion_new (
-    babl_type_from_name ("double"),
-    babl_type_from_name ("CIE u16 L"),
+    babl_type ("double"),
+    babl_type ("CIE u16 L"),
     "plane", convert_double_u16_l,
     NULL
   );
 
   babl_conversion_new (
-    babl_type_from_name ("CIE u16 ab"),
-    babl_type_from_name ("double"),
+    babl_type ("CIE u16 ab"),
+    babl_type ("double"),
     "plane", convert_u16_ab_double,
     NULL
   );
   babl_conversion_new (
-    babl_type_from_name ("double"),
-    babl_type_from_name ("CIE u16 ab"),
+    babl_type ("double"),
+    babl_type ("CIE u16 ab"),
     "plane", convert_double_u16_ab,
     NULL
   );

diff --git a/extensions/frequency.c b/extensions/frequency.c
index 2ece2f562bb9367a7dc94cf74b32f83a9d23a709..90fcf87e12a324e93fac1c5c9465a21b343be6b8 100644 (file)
--- a/extensions/frequency.c
+++ b/extensions/frequency.c
@@ -59,57 +59,57 @@ init (void)
 
   babl_model_new (
                   "name", "frequency",
-                  babl_component_from_name ("Rr"),
-                  babl_component_from_name ("Gr"),
-                  babl_component_from_name ("Br"),
-                  babl_component_from_name ("Ar"),
-                  babl_component_from_name ("Ri"),
-                  babl_component_from_name ("Gi"),
-                  babl_component_from_name ("Bi"),
-                  babl_component_from_name ("Ai"),
+                  babl_component ("Rr"),
+                  babl_component ("Gr"),
+                  babl_component ("Br"),
+                  babl_component ("Ar"),
+                  babl_component ("Ri"),
+                  babl_component ("Gi"),
+                  babl_component ("Bi"),
+                  babl_component ("Ai"),
                   NULL
                   );
 
   babl_conversion_new (
-                       babl_model_from_name ("RGBA"),
-                       babl_model_from_name ("frequency"),
+                       babl_model ("RGBA"),
+                       babl_model ("frequency"),
                        "linear", rgba_to_frequency,
                        NULL
                        );
 
   babl_conversion_new (
-                       babl_model_from_name ("frequency"),
-                       babl_model_from_name ("RGBA"),
+                       babl_model ("frequency"),
+                       babl_model ("RGBA"),
                        "linear", frequency_to_rgba,
                        NULL
                        );
 
   babl_format_new (
                    "name", "frequency float",
-                   babl_model_from_name ("frequency"),
-                   babl_component_from_name ("Rr"),
-                   babl_component_from_name ("Gr"),
-                   babl_component_from_name ("Br"),
-                   babl_component_from_name ("Ar"),
-                   babl_component_from_name ("Ri"),
-                   babl_component_from_name ("Gi"),
-                   babl_component_from_name ("Bi"),
-                   babl_component_from_name ("Ai"),
+                   babl_model ("frequency"),
+                   babl_component ("Rr"),
+                   babl_component ("Gr"),
+                   babl_component ("Br"),
+                   babl_component ("Ar"),
+                   babl_component ("Ri"),
+                   babl_component ("Gi"),
+                   babl_component ("Bi"),
+                   babl_component ("Ai"),
                    NULL
                    );
 
   babl_format_new (
                    "name", "frequency double",
-                   babl_model_from_name ("frequency"),
-                   babl_type_from_name ("double"),
-                   babl_component_from_name ("Rr"),
-                   babl_component_from_name ("Gr"),
-                   babl_component_from_name ("Br"),
-                   babl_component_from_name ("Ar"),
-                   babl_component_from_name ("Ri"),
-                   babl_component_from_name ("Gi"),
-                   babl_component_from_name ("Bi"),
-                   babl_component_from_name ("Ai"),
+                   babl_model ("frequency"),
+                   babl_type ("double"),
+                   babl_component ("Rr"),
+                   babl_component ("Gr"),
+                   babl_component ("Br"),
+                   babl_component ("Ar"),
+                   babl_component ("Ri"),
+                   babl_component ("Gi"),
+                   babl_component ("Bi"),
+                   babl_component ("Ai"),
                    NULL
                    );
     

diff --git a/extensions/gegl-fixups.c b/extensions/gegl-fixups.c
index fec745793b2a922d3863a956c822a2e4f8988282..df4676accbe7b22c641449c6aee6e0fa93f4b605 100644 (file)
--- a/extensions/gegl-fixups.c
+++ b/extensions/gegl-fixups.c
@@ -527,63 +527,63 @@ int
 init (void)
 {
   Babl *rgbaF = babl_format_new (
-    babl_model_from_name ("RGBA"),
-    babl_type_from_name ("float"),
-    babl_component_from_name ("R"),
-    babl_component_from_name ("G"),
-    babl_component_from_name ("B"),
-    babl_component_from_name ("A"),
+    babl_model ("RGBA"),
+    babl_type ("float"),
+    babl_component ("R"),
+    babl_component ("G"),
+    babl_component ("B"),
+    babl_component ("A"),
     NULL);
   Babl *rgbAF = babl_format_new (
-    babl_model_from_name ("RaGaBaA"),
-    babl_type_from_name ("float"),
-    babl_component_from_name ("Ra"),
-    babl_component_from_name ("Ga"),
-    babl_component_from_name ("Ba"),
-    babl_component_from_name ("A"),
+    babl_model ("RaGaBaA"),
+    babl_type ("float"),
+    babl_component ("Ra"),
+    babl_component ("Ga"),
+    babl_component ("Ba"),
+    babl_component ("A"),
     NULL);
 
   Babl *lrgba8 = babl_format_new (
-    babl_model_from_name ("RGBA"),
-    babl_type_from_name ("u8"),
-    babl_component_from_name ("R"),
-    babl_component_from_name ("G"),
-    babl_component_from_name ("B"),
-    babl_component_from_name ("A"),
+    babl_model ("RGBA"),
+    babl_type ("u8"),
+    babl_component ("R"),
+    babl_component ("G"),
+    babl_component ("B"),
+    babl_component ("A"),
     NULL);
 
   Babl *rgba8 = babl_format_new (
-    babl_model_from_name ("R'G'B'A"),
-    babl_type_from_name ("u8"),
-    babl_component_from_name ("R'"),
-    babl_component_from_name ("G'"),
-    babl_component_from_name ("B'"),
-    babl_component_from_name ("A"),
+    babl_model ("R'G'B'A"),
+    babl_type ("u8"),
+    babl_component ("R'"),
+    babl_component ("G'"),
+    babl_component ("B'"),
+    babl_component ("A"),
     NULL);
   Babl *bgrA8 = babl_format_new (
     "name", "B'aG'aR'aA u8",
-    babl_model_from_name ("R'aG'aB'aA"),
-    babl_type_from_name ("u8"),
-    babl_component_from_name ("B'a"),
-    babl_component_from_name ("G'a"),
-    babl_component_from_name ("R'a"),
-    babl_component_from_name ("A"),
+    babl_model ("R'aG'aB'aA"),
+    babl_type ("u8"),
+    babl_component ("B'a"),
+    babl_component ("G'a"),
+    babl_component ("R'a"),
+    babl_component ("A"),
     NULL);
   Babl *rgb8 = babl_format_new (
-    babl_model_from_name ("R'G'B'"),
-    babl_type_from_name ("u8"),
-    babl_component_from_name ("R'"),
-    babl_component_from_name ("G'"),
-    babl_component_from_name ("B'"),
+    babl_model ("R'G'B'"),
+    babl_type ("u8"),
+    babl_component ("R'"),
+    babl_component ("G'"),
+    babl_component ("B'"),
     NULL);
   Babl *sdl32 = babl_format_new (
     "name", "B'aG'aR'aPAD u8",
-    babl_model_from_name ("R'G'B'"),
-    babl_type_from_name ("u8"),
-    babl_component_from_name ("B'"),
-    babl_component_from_name ("G'"),
-    babl_component_from_name ("R'"),
-    babl_component_from_name ("PAD"),
+    babl_model ("R'G'B'"),
+    babl_type ("u8"),
+    babl_component ("B'"),
+    babl_component ("G'"),
+    babl_component ("R'"),
+    babl_component ("PAD"),
     NULL);
 
   table_init ();

diff --git a/extensions/gggl-lies.c b/extensions/gggl-lies.c
index cdd8856bbf23f2779927f29e994205abe78402c7..0fcfd7bd07ddc776ea8980c0a65925d8f834673e 100644 (file)
--- a/extensions/gggl-lies.c
+++ b/extensions/gggl-lies.c
@@ -1796,158 +1796,158 @@ int
 init (void)
 {
   Babl *rgbaF = babl_format_new (
-    babl_model_from_name ("RGBA"),
-    babl_type_from_name ("float"),
-    babl_component_from_name ("R"),
-    babl_component_from_name ("G"),
-    babl_component_from_name ("B"),
-    babl_component_from_name ("A"),
+    babl_model ("RGBA"),
+    babl_type ("float"),
+    babl_component ("R"),
+    babl_component ("G"),
+    babl_component ("B"),
+    babl_component ("A"),
     NULL);
   Babl *rgba16 = babl_format_new (
-    babl_model_from_name ("RGBA"),
-    babl_type_from_name ("u16"),
-    babl_component_from_name ("R"),
-    babl_component_from_name ("G"),
-    babl_component_from_name ("B"),
-    babl_component_from_name ("A"),
+    babl_model ("RGBA"),
+    babl_type ("u16"),
+    babl_component ("R"),
+    babl_component ("G"),
+    babl_component ("B"),
+    babl_component ("A"),
     NULL);
   Babl *rgbaD = babl_format_new (
-    babl_model_from_name ("RGBA"),
-    babl_type_from_name ("double"),
-    babl_component_from_name ("R"),
-    babl_component_from_name ("G"),
-    babl_component_from_name ("B"),
-    babl_component_from_name ("A"),
+    babl_model ("RGBA"),
+    babl_type ("double"),
+    babl_component ("R"),
+    babl_component ("G"),
+    babl_component ("B"),
+    babl_component ("A"),
     NULL);
   Babl *rgba8 = babl_format_new (
-    babl_model_from_name ("RGBA"),
-    babl_type_from_name ("u8"),
-    babl_component_from_name ("R"),
-    babl_component_from_name ("G"),
-    babl_component_from_name ("B"),
-    babl_component_from_name ("A"),
+    babl_model ("RGBA"),
+    babl_type ("u8"),
+    babl_component ("R"),
+    babl_component ("G"),
+    babl_component ("B"),
+    babl_component ("A"),
     NULL);
   Babl *rgbAF = babl_format_new (
-    babl_model_from_name ("RaGaBaA"),
-    babl_type_from_name ("float"),
-    babl_component_from_name ("Ra"),
-    babl_component_from_name ("Ga"),
-    babl_component_from_name ("Ba"),
-    babl_component_from_name ("A"),
+    babl_model ("RaGaBaA"),
+    babl_type ("float"),
+    babl_component ("Ra"),
+    babl_component ("Ga"),
+    babl_component ("Ba"),
+    babl_component ("A"),
     NULL);
   Babl *rgbA16 = babl_format_new (
-    babl_model_from_name ("RaGaBaA"),
-    babl_type_from_name ("u16"),
-    babl_component_from_name ("Ra"),
-    babl_component_from_name ("Ga"),
-    babl_component_from_name ("Ba"),
-    babl_component_from_name ("A"),
+    babl_model ("RaGaBaA"),
+    babl_type ("u16"),
+    babl_component ("Ra"),
+    babl_component ("Ga"),
+    babl_component ("Ba"),
+    babl_component ("A"),
     NULL);
   Babl *rgbA8 = babl_format_new (
-    babl_model_from_name ("RaGaBaA"),
-    babl_type_from_name ("u8"),
-    babl_component_from_name ("Ra"),
-    babl_component_from_name ("Ga"),
-    babl_component_from_name ("Ba"),
-    babl_component_from_name ("A"),
+    babl_model ("RaGaBaA"),
+    babl_type ("u8"),
+    babl_component ("Ra"),
+    babl_component ("Ga"),
+    babl_component ("Ba"),
+    babl_component ("A"),
     NULL);
   Babl *rgbF = babl_format_new (
-    babl_model_from_name ("RGB"),
-    babl_type_from_name ("float"),
-    babl_component_from_name ("R"),
-    babl_component_from_name ("G"),
-    babl_component_from_name ("B"),
+    babl_model ("RGB"),
+    babl_type ("float"),
+    babl_component ("R"),
+    babl_component ("G"),
+    babl_component ("B"),
     NULL);
   Babl *rgb16 = babl_format_new (
-    babl_model_from_name ("RGB"),
-    babl_type_from_name ("u16"),
-    babl_component_from_name ("R"),
-    babl_component_from_name ("G"),
-    babl_component_from_name ("B"),
+    babl_model ("RGB"),
+    babl_type ("u16"),
+    babl_component ("R"),
+    babl_component ("G"),
+    babl_component ("B"),
     NULL);
   Babl *rgb8 = babl_format_new (
-    babl_model_from_name ("RGB"),
-    babl_type_from_name ("u8"),
-    babl_component_from_name ("R"),
-    babl_component_from_name ("G"),
-    babl_component_from_name ("B"),
+    babl_model ("RGB"),
+    babl_type ("u8"),
+    babl_component ("R"),
+    babl_component ("G"),
+    babl_component ("B"),
     NULL);
   Babl *gaF = babl_format_new (
-    babl_model_from_name ("YA"),
-    babl_type_from_name ("float"),
-    babl_component_from_name ("Y"),
-    babl_component_from_name ("A"),
+    babl_model ("YA"),
+    babl_type ("float"),
+    babl_component ("Y"),
+    babl_component ("A"),
     NULL);
   Babl *gAF = babl_format_new (
-    babl_model_from_name ("YaA"),
-    babl_type_from_name ("float"),
-    babl_component_from_name ("Ya"),
-    babl_component_from_name ("A"),
+    babl_model ("YaA"),
+    babl_type ("float"),
+    babl_component ("Ya"),
+    babl_component ("A"),
     NULL);
   Babl *gF = babl_format_new (
-    babl_model_from_name ("Y"),
-    babl_type_from_name ("float"),
-    babl_component_from_name ("Y"),
+    babl_model ("Y"),
+    babl_type ("float"),
+    babl_component ("Y"),
     NULL);
   Babl *ga16 = babl_format_new (
-    babl_model_from_name ("YA"),
-    babl_type_from_name ("u16"),
-    babl_component_from_name ("Y"),
-    babl_component_from_name ("A"),
+    babl_model ("YA"),
+    babl_type ("u16"),
+    babl_component ("Y"),
+    babl_component ("A"),
     NULL);
   Babl *gA16 = babl_format_new (
-    babl_model_from_name ("YaA"),
-    babl_type_from_name ("u16"),
-    babl_component_from_name ("Ya"),
-    babl_component_from_name ("A"),
+    babl_model ("YaA"),
+    babl_type ("u16"),
+    babl_component ("Ya"),
+    babl_component ("A"),
     NULL);
   Babl *g16 = babl_format_new (
-    babl_model_from_name ("Y"),
-    babl_type_from_name ("u16"),
-    babl_component_from_name ("Y"),
+    babl_model ("Y"),
+    babl_type ("u16"),
+    babl_component ("Y"),
     NULL);
   Babl *ga8 = babl_format_new (
-    babl_model_from_name ("YA"),
-    babl_type_from_name ("u8"),
-    babl_component_from_name ("Y"),
-    babl_component_from_name ("A"),
+    babl_model ("YA"),
+    babl_type ("u8"),
+    babl_component ("Y"),
+    babl_component ("A"),
     NULL);
   Babl *gA8 = babl_format_new (
-    babl_model_from_name ("YaA"),
-    babl_type_from_name ("u8"),
-    babl_component_from_name ("Ya"),
-    babl_component_from_name ("A"),
+    babl_model ("YaA"),
+    babl_type ("u8"),
+    babl_component ("Ya"),
+    babl_component ("A"),
     NULL);
   Babl *g8 = babl_format_new (
-    babl_model_from_name ("Y"),
-    babl_type_from_name ("u8"),
-    babl_component_from_name ("Y"),
+    babl_model ("Y"),
+    babl_type ("u8"),
+    babl_component ("Y"),
     NULL);
   Babl *yuv8 = babl_format_new (
     "name", "Y'CbCr u8",
-    babl_model_from_name ("Y'CbCr"),
-    babl_type_from_name ("u8-luma"),
-    babl_component_from_name ("Y'"),
-    babl_type_from_name ("u8-chroma"),
-    babl_component_from_name ("Cb"),
-    babl_component_from_name ("Cr"),
+    babl_model ("Y'CbCr"),
+    babl_type ("u8-luma"),
+    babl_component ("Y'"),
+    babl_type ("u8-chroma"),
+    babl_component ("Cb"),
+    babl_component ("Cr"),
     NULL);
   Babl *yuvF = babl_format_new (
-    babl_model_from_name ("Y'CbCr"),
-    babl_type_from_name ("float"),
-    babl_component_from_name ("Y'"),
-    babl_type_from_name ("float"),
-    babl_component_from_name ("Cb"),
-    babl_component_from_name ("Cr"),
+    babl_model ("Y'CbCr"),
+    babl_type ("float"),
+    babl_component ("Y'"),
+    babl_type ("float"),
+    babl_component ("Cb"),
+    babl_component ("Cr"),
     NULL);
   Babl *yuvaF = babl_format_new (
-    babl_model_from_name ("Y'CbCrA"),
-    babl_type_from_name ("float"),
-    babl_component_from_name ("Y'"),
-    babl_type_from_name ("float"),
-    babl_component_from_name ("Cb"),
-    babl_component_from_name ("Cr"),
-    babl_component_from_name ("A"),
+    babl_model ("Y'CbCrA"),
+    babl_type ("float"),
+    babl_component ("Y'"),
+    babl_type ("float"),
+    babl_component ("Cb"),
+    babl_component ("Cr"),
+    babl_component ("A"),
     NULL);
 
 #define o(src, dst) \

diff --git a/extensions/gggl.c b/extensions/gggl.c
index 2e36c01b090528940c0f6ddb40cf20668c67da3e..e24e51c61cda02aff6d1f7493ec625dc0320303f 100644 (file)
--- a/extensions/gggl.c
+++ b/extensions/gggl.c
@@ -1887,158 +1887,158 @@ int
 init (void)
 {
   Babl *rgbaD = babl_format_new (
-    babl_model_from_name ("R'G'B'A"),
-    babl_type_from_name ("double"),
-    babl_component_from_name ("R'"),
-    babl_component_from_name ("G'"),
-    babl_component_from_name ("B'"),
-    babl_component_from_name ("A"),
+    babl_model ("R'G'B'A"),
+    babl_type ("double"),
+    babl_component ("R'"),
+    babl_component ("G'"),
+    babl_component ("B'"),
+    babl_component ("A"),
     NULL);
   Babl *rgbaF = babl_format_new (
-    babl_model_from_name ("R'G'B'A"),
-    babl_type_from_name ("float"),
-    babl_component_from_name ("R'"),
-    babl_component_from_name ("G'"),
-    babl_component_from_name ("B'"),
-    babl_component_from_name ("A"),
+    babl_model ("R'G'B'A"),
+    babl_type ("float"),
+    babl_component ("R'"),
+    babl_component ("G'"),
+    babl_component ("B'"),
+    babl_component ("A"),
     NULL);
   Babl *rgba16 = babl_format_new (
-    babl_model_from_name ("R'G'B'A"),
-    babl_type_from_name ("u16"),
-    babl_component_from_name ("R'"),
-    babl_component_from_name ("G'"),
-    babl_component_from_name ("B'"),
-    babl_component_from_name ("A"),
+    babl_model ("R'G'B'A"),
+    babl_type ("u16"),
+    babl_component ("R'"),
+    babl_component ("G'"),
+    babl_component ("B'"),
+    babl_component ("A"),
     NULL);
   Babl *rgba8 = babl_format_new (
-    babl_model_from_name ("R'G'B'A"),
-    babl_type_from_name ("u8"),
-    babl_component_from_name ("R'"),
-    babl_component_from_name ("G'"),
-    babl_component_from_name ("B'"),
-    babl_component_from_name ("A"),
+    babl_model ("R'G'B'A"),
+    babl_type ("u8"),
+    babl_component ("R'"),
+    babl_component ("G'"),
+    babl_component ("B'"),
+    babl_component ("A"),
     NULL);
   Babl *rgbAF = babl_format_new (
-    babl_model_from_name ("R'aG'aB'aA"),
-    babl_type_from_name ("float"),
-    babl_component_from_name ("R'a"),
-    babl_component_from_name ("G'a"),
-    babl_component_from_name ("B'a"),
-    babl_component_from_name ("A"),
+    babl_model ("R'aG'aB'aA"),
+    babl_type ("float"),
+    babl_component ("R'a"),
+    babl_component ("G'a"),
+    babl_component ("B'a"),
+    babl_component ("A"),
     NULL);
   Babl *rgbA16 = babl_format_new (
-    babl_model_from_name ("R'aG'aB'aA"),
-    babl_type_from_name ("u16"),
-    babl_component_from_name ("R'a"),
-    babl_component_from_name ("G'a"),
-    babl_component_from_name ("B'a"),
-    babl_component_from_name ("A"),
+    babl_model ("R'aG'aB'aA"),
+    babl_type ("u16"),
+    babl_component ("R'a"),
+    babl_component ("G'a"),
+    babl_component ("B'a"),
+    babl_component ("A"),
     NULL);
   Babl *rgbA8 = babl_format_new (
-    babl_model_from_name ("R'aG'aB'aA"),
-    babl_type_from_name ("u8"),
-    babl_component_from_name ("R'a"),
-    babl_component_from_name ("G'a"),
-    babl_component_from_name ("B'a"),
-    babl_component_from_name ("A"),
+    babl_model ("R'aG'aB'aA"),
+    babl_type ("u8"),
+    babl_component ("R'a"),
+    babl_component ("G'a"),
+    babl_component ("B'a"),
+    babl_component ("A"),
     NULL);
   Babl *rgbF = babl_format_new (
-    babl_model_from_name ("R'G'B'"),
-    babl_type_from_name ("float"),
-    babl_component_from_name ("R'"),
-    babl_component_from_name ("G'"),
-    babl_component_from_name ("B'"),
+    babl_model ("R'G'B'"),
+    babl_type ("float"),
+    babl_component ("R'"),
+    babl_component ("G'"),
+    babl_component ("B'"),
     NULL);
   Babl *rgb16 = babl_format_new (
-    babl_model_from_name ("R'G'B'"),
-    babl_type_from_name ("u16"),
-    babl_component_from_name ("R'"),
-    babl_component_from_name ("G'"),
-    babl_component_from_name ("B'"),
+    babl_model ("R'G'B'"),
+    babl_type ("u16"),
+    babl_component ("R'"),
+    babl_component ("G'"),
+    babl_component ("B'"),
     NULL);
   Babl *rgb8 = babl_format_new (
-    babl_model_from_name ("R'G'B'"),
-    babl_type_from_name ("u8"),
-    babl_component_from_name ("R'"),
-    babl_component_from_name ("G'"),
-    babl_component_from_name ("B'"),
+    babl_model ("R'G'B'"),
+    babl_type ("u8"),
+    babl_component ("R'"),
+    babl_component ("G'"),
+    babl_component ("B'"),
     NULL);
   Babl *gaF = babl_format_new (
-    babl_model_from_name ("Y'A"),
-    babl_type_from_name ("float"),
-    babl_component_from_name ("Y'"),
-    babl_component_from_name ("A"),
+    babl_model ("Y'A"),
+    babl_type ("float"),
+    babl_component ("Y'"),
+    babl_component ("A"),
     NULL);
   Babl *gAF = babl_format_new (
-    babl_model_from_name ("Y'aA"),
-    babl_type_from_name ("float"),
-    babl_component_from_name ("Y'a"),
-    babl_component_from_name ("A"),
+    babl_model ("Y'aA"),
+    babl_type ("float"),
+    babl_component ("Y'a"),
+    babl_component ("A"),
     NULL);
   Babl *gF = babl_format_new (
-    babl_model_from_name ("Y'"),
-    babl_type_from_name ("float"),
-    babl_component_from_name ("Y'"),
+    babl_model ("Y'"),
+    babl_type ("float"),
+    babl_component ("Y'"),
     NULL);
   Babl *ga16 = babl_format_new (
-    babl_model_from_name ("Y'A"),
-    babl_type_from_name ("u16"),
-    babl_component_from_name ("Y'"),
-    babl_component_from_name ("A"),
+    babl_model ("Y'A"),
+    babl_type ("u16"),
+    babl_component ("Y'"),
+    babl_component ("A"),
     NULL);
   Babl *gA16 = babl_format_new (
-    babl_model_from_name ("Y'aA"),
-    babl_type_from_name ("u16"),
-    babl_component_from_name ("Y'a"),
-    babl_component_from_name ("A"),
+    babl_model ("Y'aA"),
+    babl_type ("u16"),
+    babl_component ("Y'a"),
+    babl_component ("A"),
     NULL);
   Babl *g16 = babl_format_new (
-    babl_model_from_name ("Y'"),
-    babl_type_from_name ("u16"),
-    babl_component_from_name ("Y'"),
+    babl_model ("Y'"),
+    babl_type ("u16"),
+    babl_component ("Y'"),
     NULL);
   Babl *ga8 = babl_format_new (
-    babl_model_from_name ("Y'A"),
-    babl_type_from_name ("u8"),
-    babl_component_from_name ("Y'"),
-    babl_component_from_name ("A"),
+    babl_model ("Y'A"),
+    babl_type ("u8"),
+    babl_component ("Y'"),
+    babl_component ("A"),
     NULL);
   Babl *gA8 = babl_format_new (
-    babl_model_from_name ("Y'aA"),
-    babl_type_from_name ("u8"),
-    babl_component_from_name ("Y'a"),
-    babl_component_from_name ("A"),
+    babl_model ("Y'aA"),
+    babl_type ("u8"),
+    babl_component ("Y'a"),
+    babl_component ("A"),
     NULL);
   Babl *g8 = babl_format_new (
-    babl_model_from_name ("Y'"),
-    babl_type_from_name ("u8"),
-    babl_component_from_name ("Y'"),
+    babl_model ("Y'"),
+    babl_type ("u8"),
+    babl_component ("Y'"),
     NULL);
   Babl *yuv8 = babl_format_new (
     "name", "Y'CbCr u8",
-    babl_model_from_name ("Y'CbCr"),
-    babl_type_from_name ("u8-luma"),
-    babl_component_from_name ("Y'"),
-    babl_type_from_name ("u8-chroma"),
-    babl_component_from_name ("Cb"),
-    babl_component_from_name ("Cr"),
+    babl_model ("Y'CbCr"),
+    babl_type ("u8-luma"),
+    babl_component ("Y'"),
+    babl_type ("u8-chroma"),
+    babl_component ("Cb"),
+    babl_component ("Cr"),
     NULL);
   Babl *yuvF = babl_format_new (
-    babl_model_from_name ("Y'CbCr"),
-    babl_type_from_name ("float"),
-    babl_component_from_name ("Y'"),
-    babl_type_from_name ("float"),
-    babl_component_from_name ("Cb"),
-    babl_component_from_name ("Cr"),
+    babl_model ("Y'CbCr"),
+    babl_type ("float"),
+    babl_component ("Y'"),
+    babl_type ("float"),
+    babl_component ("Cb"),
+    babl_component ("Cr"),
     NULL);
   Babl *yuvaF = babl_format_new (
-    babl_model_from_name ("Y'CbCrA"),
-    babl_type_from_name ("float"),
-    babl_component_from_name ("Y'"),
-    babl_type_from_name ("float"),
-    babl_component_from_name ("Cb"),
-    babl_component_from_name ("Cr"),
-    babl_component_from_name ("A"),
+    babl_model ("Y'CbCrA"),
+    babl_type ("float"),
+    babl_component ("Y'"),
+    babl_type ("float"),
+    babl_component ("Cb"),
+    babl_component ("Cr"),
+    babl_component ("A"),
     NULL);
 
 #define o(src, dst) \

diff --git a/extensions/gimp-8bit.c b/extensions/gimp-8bit.c
index 15d4cc535b833ae19bcdb5ffda22afa211a1b789..7868cb88ff325ac2cb3e5358d748b98b8721a360 100644 (file)
--- a/extensions/gimp-8bit.c
+++ b/extensions/gimp-8bit.c
@@ -354,82 +354,82 @@ int
 init (void)
 {
   Babl *rgbaF_linear = babl_format_new (
-    babl_model_from_name ("RGBA"),
-    babl_type_from_name ("float"),
-    babl_component_from_name ("R"),
-    babl_component_from_name ("G"),
-    babl_component_from_name ("B"),
-    babl_component_from_name ("A"),
+    babl_model ("RGBA"),
+    babl_type ("float"),
+    babl_component ("R"),
+    babl_component ("G"),
+    babl_component ("B"),
+    babl_component ("A"),
     NULL);
   Babl *rgba8_linear = babl_format_new (
-    babl_model_from_name ("RGBA"),
-    babl_type_from_name ("u8"),
-    babl_component_from_name ("R"),
-    babl_component_from_name ("G"),
-    babl_component_from_name ("B"),
-    babl_component_from_name ("A"),
+    babl_model ("RGBA"),
+    babl_type ("u8"),
+    babl_component ("R"),
+    babl_component ("G"),
+    babl_component ("B"),
+    babl_component ("A"),
     NULL);
   Babl *rgba8_gamma_2_2 = babl_format_new (
-    babl_model_from_name ("R'G'B'A"),
-    babl_type_from_name ("u8"),
-    babl_component_from_name ("R'"),
-    babl_component_from_name ("G'"),
-    babl_component_from_name ("B'"),
-    babl_component_from_name ("A"),
+    babl_model ("R'G'B'A"),
+    babl_type ("u8"),
+    babl_component ("R'"),
+    babl_component ("G'"),
+    babl_component ("B'"),
+    babl_component ("A"),
     NULL);
   Babl *rgbF_linear = babl_format_new (
-    babl_model_from_name ("RGB"),
-    babl_type_from_name ("float"),
-    babl_component_from_name ("R"),
-    babl_component_from_name ("G"),
-    babl_component_from_name ("B"),
+    babl_model ("RGB"),
+    babl_type ("float"),
+    babl_component ("R"),
+    babl_component ("G"),
+    babl_component ("B"),
     NULL);
   Babl *rgb8_linear = babl_format_new (
-    babl_model_from_name ("RGB"),
-    babl_type_from_name ("u8"),
-    babl_component_from_name ("R"),
-    babl_component_from_name ("G"),
-    babl_component_from_name ("B"),
+    babl_model ("RGB"),
+    babl_type ("u8"),
+    babl_component ("R"),
+    babl_component ("G"),
+    babl_component ("B"),
     NULL);
   Babl *rgb8_gamma_2_2 = babl_format_new (
-    babl_model_from_name ("R'G'B'"),
-    babl_type_from_name ("u8"),
-    babl_component_from_name ("R'"),
-    babl_component_from_name ("G'"),
-    babl_component_from_name ("B'"),
+    babl_model ("R'G'B'"),
+    babl_type ("u8"),
+    babl_component ("R'"),
+    babl_component ("G'"),
+    babl_component ("B'"),
     NULL);
   Babl *gaF_linear = babl_format_new (
-    babl_model_from_name ("YA"),
-    babl_type_from_name ("float"),
-    babl_component_from_name ("Y"),
-    babl_component_from_name ("A"),
+    babl_model ("YA"),
+    babl_type ("float"),
+    babl_component ("Y"),
+    babl_component ("A"),
     NULL);
   Babl *ga8_linear = babl_format_new (
-    babl_model_from_name ("YA"),
-    babl_type_from_name ("u8"),
-    babl_component_from_name ("Y"),
-    babl_component_from_name ("A"),
+    babl_model ("YA"),
+    babl_type ("u8"),
+    babl_component ("Y"),
+    babl_component ("A"),
     NULL);
   Babl *ga8_gamma_2_2 = babl_format_new (
-    babl_model_from_name ("Y'A"),
-    babl_type_from_name ("u8"),
-    babl_component_from_name ("Y'"),
-    babl_component_from_name ("A"),
+    babl_model ("Y'A"),
+    babl_type ("u8"),
+    babl_component ("Y'"),
+    babl_component ("A"),
     NULL);
   Babl *gF_linear = babl_format_new (
-    babl_model_from_name ("Y"),
-    babl_type_from_name ("float"),
-    babl_component_from_name ("Y"),
+    babl_model ("Y"),
+    babl_type ("float"),
+    babl_component ("Y"),
     NULL);
   Babl *g8_linear = babl_format_new (
-    babl_model_from_name ("Y"),
-    babl_type_from_name ("u8"),
-    babl_component_from_name ("Y"),
+    babl_model ("Y"),
+    babl_type ("u8"),
+    babl_component ("Y"),
     NULL);
   Babl *g8_gamma_2_2 = babl_format_new (
-    babl_model_from_name ("Y'"),
-    babl_type_from_name ("u8"),
-    babl_component_from_name ("Y'"),
+    babl_model ("Y'"),
+    babl_type ("u8"),
+    babl_component ("Y'"),
     NULL);
 
   tables_init ();

diff --git a/extensions/naive-CMYK.c b/extensions/naive-CMYK.c
index a44bbb136b7d329b0597f6396ae032e692b0c724..783df349883579c549045d68d21ec9f07f455f75 100644 (file)
--- a/extensions/naive-CMYK.c
+++ b/extensions/naive-CMYK.c
@@ -44,34 +44,34 @@ init (void)
 
   babl_model_new (
     "name", "CMYK",
-    babl_component_from_name ("cyan"),
-    babl_component_from_name ("magenta"),
-    babl_component_from_name ("yellow"),
-    babl_component_from_name ("key"),
+    babl_component ("cyan"),
+    babl_component ("magenta"),
+    babl_component ("yellow"),
+    babl_component ("key"),
     NULL
   );
 
   babl_conversion_new (
-    babl_model_from_name ("RGBA"),
-    babl_model_from_name ("CMYK"),
+    babl_model ("RGBA"),
+    babl_model ("CMYK"),
     "linear", rgba_to_cmyk,
     NULL
   );
 
   babl_conversion_new (
-    babl_model_from_name ("CMYK"),
-    babl_model_from_name ("RGBA"),
+    babl_model ("CMYK"),
+    babl_model ("RGBA"),
     "linear", cmyk_to_rgba,
     NULL
   );
   babl_format_new (
     "name", "CMYK float",
-    babl_model_from_name ("CMYK"),
-    babl_type_from_name ("float"),
-    babl_component_from_name ("cyan"),
-    babl_component_from_name ("yellow"),
-    babl_component_from_name ("magenta"),
-    babl_component_from_name ("key"),
+    babl_model ("CMYK"),
+    babl_type ("float"),
+    babl_component ("cyan"),
+    babl_component ("yellow"),
+    babl_component ("magenta"),
+    babl_component ("key"),
     NULL
   );
 

diff --git a/extensions/sse-fixups.c b/extensions/sse-fixups.c
index 55de5c53b379a0c0734126e014e4eee6946e06f3..1866556e11eb6470583becec9c608e1b972a45cd 100644 (file)
--- a/extensions/sse-fixups.c
+++ b/extensions/sse-fixups.c
@@ -175,27 +175,27 @@ init (void)
 #if defined(__GNUC__) && (__GNUC__ >= 4) && defined(USE_SSE) && defined(USE_MMX)
 
   Babl *rgbaF_linear = babl_format_new (
-    babl_model_from_name ("RGBA"),
-    babl_type_from_name ("float"),
-    babl_component_from_name ("R"),
-    babl_component_from_name ("G"),
-    babl_component_from_name ("B"),
-    babl_component_from_name ("A"),
+    babl_model ("RGBA"),
+    babl_type ("float"),
+    babl_component ("R"),
+    babl_component ("G"),
+    babl_component ("B"),
+    babl_component ("A"),
     NULL);
   Babl *rgba8_linear = babl_format_new (
-    babl_model_from_name ("RGBA"),
-    babl_type_from_name ("u8"),
-    babl_component_from_name ("R"),
-    babl_component_from_name ("G"),
-    babl_component_from_name ("B"),
-    babl_component_from_name ("A"),
+    babl_model ("RGBA"),
+    babl_type ("u8"),
+    babl_component ("R"),
+    babl_component ("G"),
+    babl_component ("B"),
+    babl_component ("A"),
     NULL);
   Babl *rgb8_linear = babl_format_new (
-    babl_model_from_name ("RGB"),
-    babl_type_from_name ("u8"),
-    babl_component_from_name ("R"),
-    babl_component_from_name ("G"),
-    babl_component_from_name ("B"),
+    babl_model ("RGB"),
+    babl_type ("u8"),
+    babl_component ("R"),
+    babl_component ("G"),
+    babl_component ("B"),
     NULL);
 
   if ((babl_cpu_accel_get_support () & BABL_CPU_ACCEL_X86_MMX) &&

diff --git a/tests/grayscale_to_rgb.c b/tests/grayscale_to_rgb.c
index 698cdd9aa6eea41acbc0e52beff8bc6daf48c438..f73d186a1e859c70b73ce11d721f2d1524cb1e8d 100644 (file)
--- a/tests/grayscale_to_rgb.c
+++ b/tests/grayscale_to_rgb.c
@@ -37,17 +37,17 @@ test (void)
 
   fish = babl_fish (
     babl_format_new (
-      babl_model_from_name ("Y"),
-      babl_type_from_name ("float"),
-      babl_component_from_name ("Y"),
+      babl_model ("Y"),
+      babl_type ("float"),
+      babl_component ("Y"),
       NULL
     ),
     babl_format_new (
-      babl_model_from_name ("RGB"),
-      babl_type_from_name ("float"),
-      babl_component_from_name ("R"),
-      babl_component_from_name ("G"),
-      babl_component_from_name ("B"),
+      babl_model ("RGB"),
+      babl_type ("float"),
+      babl_component ("R"),
+      babl_component ("G"),
+      babl_component ("B"),
       NULL
     )
          );

diff --git a/tests/rgb_to_bgr.c b/tests/rgb_to_bgr.c
index a60bca5a3d02dc0ebee295ca942abd620dba956b..ddbadeb7c703fb449f01e73034995fec25752817 100644 (file)
--- a/tests/rgb_to_bgr.c
+++ b/tests/rgb_to_bgr.c
@@ -44,19 +44,19 @@ test (void)
 
   fish = babl_fish (
     babl_format_new (
-      babl_model_from_name ("RGB"),
-      babl_type_from_name ("u8"),
-      babl_component_from_name ("R"),
-      babl_component_from_name ("G"),
-      babl_component_from_name ("B"),
+      babl_model ("RGB"),
+      babl_type ("u8"),
+      babl_component ("R"),
+      babl_component ("G"),
+      babl_component ("B"),
       NULL
     ),
     babl_format_new (
-      babl_model_from_name ("RGB"),
-      babl_type_from_name ("u8"),
-      babl_component_from_name ("B"),
-      babl_component_from_name ("G"),
-      babl_component_from_name ("R"),
+      babl_model ("RGB"),
+      babl_type ("u8"),
+      babl_component ("B"),
+      babl_component ("G"),
+      babl_component ("R"),
       NULL
     )
          );

diff --git a/tests/rgb_to_ycbcr.c b/tests/rgb_to_ycbcr.c
index efee80c1424c5d7768a226a1e2f47ea77e4011f8..26650980cb5f3bfdba8a66424054ae350927a0d1 100644 (file)
--- a/tests/rgb_to_ycbcr.c
+++ b/tests/rgb_to_ycbcr.c
@@ -51,19 +51,19 @@ test (void)
 
   fish = babl_fish (
     babl_format_new (
-      babl_model_from_name ("RGB"),
-      babl_type_from_name ("float"),
-      babl_component_from_name ("R"),
-      babl_component_from_name ("G"),
-      babl_component_from_name ("B"),
+      babl_model ("RGB"),
+      babl_type ("float"),
+      babl_component ("R"),
+      babl_component ("G"),
+      babl_component ("B"),
       NULL
     ),
     babl_format_new (
-      babl_model_from_name ("Y'CbCr"),
-      babl_type_from_name ("float"),
-      babl_component_from_name ("Y'"),
-      babl_component_from_name ("Cb"),
-      babl_component_from_name ("Cr"),
+      babl_model ("Y'CbCr"),
+      babl_type ("float"),
+      babl_component ("Y'"),
+      babl_component ("Cb"),
+      babl_component ("Cr"),
       NULL
     )
          );